bitkeeper revision 1.1493 (428e623eLixPFfNTxCYBeRcapHg86g)
authoriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>
Fri, 20 May 2005 22:18:38 +0000 (22:18 +0000)
committeriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>
Fri, 20 May 2005 22:18:38 +0000 (22:18 +0000)
commit253b9b29987067c1bdca1e948369b1e340450b3d
tree116a36693b99c39c65d02e2d817efc837fd3ded8
parent1fbd84c81a444b01084150cb334e91a40e67b00f
parentf9307625e8fe55ca4bf5d335875787f954ef0bd9
bitkeeper revision 1.1493 (428e623eLixPFfNTxCYBeRcapHg86g)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
28 files changed:
.rootkeys
linux-2.4.30-xen-sparse/arch/xen/Makefile
linux-2.4.30-xen-sparse/arch/xen/config.in
linux-2.4.30-xen-sparse/arch/xen/defconfig-xen0
linux-2.4.30-xen-sparse/arch/xen/defconfig-xenU
linux-2.4.30-xen-sparse/arch/xen/drivers/blkif/frontend/vbd.c
linux-2.4.30-xen-sparse/arch/xen/kernel/Makefile
linux-2.4.30-xen-sparse/arch/xen/kernel/head.S
linux-2.4.30-xen-sparse/arch/xen/kernel/ldt.c
linux-2.4.30-xen-sparse/arch/xen/kernel/process.c
linux-2.4.30-xen-sparse/arch/xen/kernel/setup.c
linux-2.4.30-xen-sparse/arch/xen/kernel/traps.c
linux-2.4.30-xen-sparse/arch/xen/mm/fault.c
linux-2.4.30-xen-sparse/arch/xen/mm/init.c
linux-2.4.30-xen-sparse/arch/xen/mm/ioremap.c
linux-2.4.30-xen-sparse/include/asm-xen/desc.h
linux-2.4.30-xen-sparse/include/asm-xen/fixmap.h
linux-2.4.30-xen-sparse/include/asm-xen/mmu_context.h
linux-2.4.30-xen-sparse/include/asm-xen/page.h
linux-2.4.30-xen-sparse/include/asm-xen/pgalloc.h
linux-2.4.30-xen-sparse/include/asm-xen/pgtable-2level.h
linux-2.4.30-xen-sparse/include/asm-xen/pgtable.h
linux-2.4.30-xen-sparse/include/asm-xen/system.h
linux-2.4.30-xen-sparse/mkbuildtree
linux-2.4.30-xen-sparse/mm/highmem.c
linux-2.4.30-xen-sparse/mm/memory.c
linux-2.4.30-xen-sparse/mm/mremap.c
linux-2.6.11-xen-sparse/drivers/xen/blkfront/block.h